From ed6ccffbebc6fcb290f21207df33aefee584abfd Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild.aw" Date: Mon, 17 Apr 2006 08:46:52 -0600 Subject: [PATCH] [IA64] Remove unused variables. init_mm and swapper_pg_dir. Signed-off-by: Kouya Shimura --- xen/arch/ia64/linux-xen/head.S | 2 ++ xen/arch/ia64/linux-xen/setup.c | 2 +- xen/arch/ia64/xen/idle0_task.c | 12 ------------ xen/arch/ia64/xen/ivt.S | 15 ++++++--------- 4 files changed, 9 insertions(+), 22 deletions(-) diff --git a/xen/arch/ia64/linux-xen/head.S b/xen/arch/ia64/linux-xen/head.S index 93bb4f87d1..9ba502e831 100644 --- a/xen/arch/ia64/linux-xen/head.S +++ b/xen/arch/ia64/linux-xen/head.S @@ -178,9 +178,11 @@ RestRR: \ empty_zero_page: .skip PAGE_SIZE +#ifndef XEN .global swapper_pg_dir swapper_pg_dir: .skip PAGE_SIZE +#endif #if defined(XEN) && defined(CONFIG_VIRTUAL_FRAME_TABLE) .global frametable_pg_dir diff --git a/xen/arch/ia64/linux-xen/setup.c b/xen/arch/ia64/linux-xen/setup.c index da3e913793..55d4977879 100644 --- a/xen/arch/ia64/linux-xen/setup.c +++ b/xen/arch/ia64/linux-xen/setup.c @@ -859,8 +859,8 @@ cpu_init (void) ia64_setreg(_IA64_REG_CR_DCR, ( IA64_DCR_DP | IA64_DCR_DK | IA64_DCR_DX | IA64_DCR_DR | IA64_DCR_DA | IA64_DCR_DD | IA64_DCR_LC)); #endif - atomic_inc(&init_mm.mm_count); #ifndef XEN + atomic_inc(&init_mm.mm_count); current->active_mm = &init_mm; #endif #ifdef XEN diff --git a/xen/arch/ia64/xen/idle0_task.c b/xen/arch/ia64/xen/idle0_task.c index bc7aeed28a..da6e1c629d 100644 --- a/xen/arch/ia64/xen/idle0_task.c +++ b/xen/arch/ia64/xen/idle0_task.c @@ -2,24 +2,12 @@ #include #include -#define INIT_MM(name) \ -{ \ - .pgd = swapper_pg_dir, \ - .mm_users = ATOMIC_INIT(2), \ - .mm_count = ATOMIC_INIT(1), \ - .page_table_lock = SPIN_LOCK_UNLOCKED, \ - .mmlist = LIST_HEAD_INIT(name.mmlist), \ -} - #define IDLE_VCPU(_v) \ { \ processor: 0, \ domain: 0 \ } -struct mm_struct init_mm = INIT_MM(init_mm); -EXPORT_SYMBOL(init_mm); - /* * Initial task structure. * diff --git a/xen/arch/ia64/xen/ivt.S b/xen/arch/ia64/xen/ivt.S index abeeaabc3b..14396813de 100644 --- a/xen/arch/ia64/xen/ivt.S +++ b/xen/arch/ia64/xen/ivt.S @@ -116,6 +116,9 @@ ia64_ivt: // 0x0000 Entry 0 (size 64 bundles) VHPT Translation (8,20,47) ENTRY(vhpt_miss) DBG_FAULT(0) +#ifdef XEN + FAULT(0) +#else /* * The VHPT vector is invoked when the TLB entry for the virtual page table * is missing. This happens only as a result of a previous @@ -141,11 +144,7 @@ ENTRY(vhpt_miss) ;; rsm psr.dt // use physical addressing for data mov r31=pr // save the predicate registers -#ifdef XEN - movl r19=THIS_CPU(cpu_kr)+IA64_KR_PT_BASE_OFFSET;; -#else mov r19=IA64_KR(PT_BASE) // get page table base address -#endif shl r21=r16,3 // shift bit 60 into sign bit shr.u r17=r16,61 // get the region number into r17 ;; @@ -241,6 +240,7 @@ ENTRY(vhpt_miss) mov pr=r31,-1 // restore predicate registers rfi +#endif END(vhpt_miss) .org ia64_ivt+0x400 @@ -625,7 +625,7 @@ ENTRY(nested_dtlb_miss) mov b0=r30 br.sptk.many b0 // return to continuation point ;; -#endif +#else /* * In the absence of kernel bugs, we get here when the virtually mapped linear * page table is accessed non-speculatively (e.g., in the Dirty-bit, Instruction @@ -649,11 +649,7 @@ ENTRY(nested_dtlb_miss) * Clobbered: b0, r18, r19, r21, psr.dt (cleared) */ rsm psr.dt // switch to using physical data addressing -#ifdef XEN - movl r19=THIS_CPU(cpu_kr)+IA64_KR_PT_BASE_OFFSET;; -#else mov r19=IA64_KR(PT_BASE) // get the page table base address -#endif shl r21=r16,3 // shift bit 60 into sign bit ;; shr.u r17=r16,61 // get the region number into r17 @@ -688,6 +684,7 @@ ENTRY(nested_dtlb_miss) (p6) br.cond.spnt page_fault mov b0=r30 br.sptk.many b0 // return to continuation point +#endif END(nested_dtlb_miss) .org ia64_ivt+0x1800 -- 2.30.2